merge with xen-unstable.hg (staging)
authorAlex Williamson <alex.williamson@hp.com>
Wed, 21 Nov 2007 16:12:06 +0000 (09:12 -0700)
committerAlex Williamson <alex.williamson@hp.com>
Wed, 21 Nov 2007 16:12:06 +0000 (09:12 -0700)

Trivial merge